From 1c3bad3d907f3b824d93931edf7fb3eaf68f35f8 Mon Sep 17 00:00:00 2001
From: Lapo Calamandrei <calamandrei@gmail.com>
Date: Tue, 12 Jan 2016 01:03:47 +0100
Subject: [PATCH] Adwaita: popover style fixes

---
 gtk/theme/Adwaita/_colors.scss           |  1 +
 gtk/theme/Adwaita/_common.scss           | 12 ++++--------
 gtk/theme/Adwaita/gtk-contained-dark.css | 15 +++------------
 gtk/theme/Adwaita/gtk-contained.css      | 15 +++------------
 4 files changed, 11 insertions(+), 32 deletions(-)

diff --git a/gtk/theme/Adwaita/_colors.scss b/gtk/theme/Adwaita/_colors.scss
index 9ad5ac0eec..c4c69fef64 100644
--- a/gtk/theme/Adwaita/_colors.scss
+++ b/gtk/theme/Adwaita/_colors.scss
@@ -34,6 +34,7 @@ $osd_insensitive_fg_color: mix($osd_fg_color, opacify($osd_bg_color, 1), 50%);
 $osd_borders_color: transparentize(black, 0.3);
 
 $sidebar_bg_color: mix($bg_color, $base_color, 50%);
+$base_hover_color: transparentize($fg_color, 0.95);
 
 $tooltip_borders_color: transparentize(white, 0.9);
 
diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index 16929e5642..8b42ddbc27 100644
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -791,7 +791,7 @@ modelbutton.flat,
   outline-offset: -2px;
 
   @extend %undecorated_button;
-  &:hover { background-color: mix($fg_color, $bg_color, 10%); }
+  &:hover { background-color: $base_hover_color; } // FIXME
 
   &:selected { @extend %selected_items; }
 
@@ -903,7 +903,7 @@ spinbutton {
 
       &:hover {
         color: $fg_color;
-        background-color: transparentize($fg_color, 0.95);
+        background-color: $base_hover_color;
       }
 
       &:disabled { color: transparentize($insensitive_fg_color, 0.7); }
@@ -1752,12 +1752,6 @@ popover.background {
     background-color: transparent;
   }
 
-  button.flat,
-  button.flat:hover {
-    text-shadow: none;
-    transition: none;
-  }
-
   &, .csd & {
     &.touch-selection,
     &.magnifier {
@@ -1769,6 +1763,8 @@ popover.background {
     &.osd { @extend %osd; }
   }
 
+  separator { margin: 3px; }
+
   list separator { margin: 0px; }
 }
 
diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css
index f0b9cd8a0c..00c435609a 100644
--- a/gtk/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/theme/Adwaita/gtk-contained-dark.css
@@ -1223,7 +1223,7 @@ modelbutton.flat,
   outline-offset: -2px; }
   modelbutton.flat:hover,
   .menuitem.button.flat:hover {
-    background-color: #4b5150; }
+    background-color: rgba(238, 238, 236, 0.05); }
   modelbutton.flat check:last-child,
   modelbutton.flat radio:last-child,
   .menuitem.button.flat check:last-child,
@@ -2240,19 +2240,10 @@ popover.background {
   popover.background > .location-bar {
     border-style: none;
     background-color: transparent; }
-  popover.background button.flat, popover.background button.sidebar-button, popover.background headerbar button.titlebutton, headerbar popover.background button.titlebutton,
-  popover.background .titlebar button.titlebutton,
-  .titlebar popover.background button.titlebutton,
-  popover.background button.flat:hover,
-  popover.background button.sidebar-button:hover,
-  popover.background headerbar button.titlebutton:hover,
-  headerbar popover.background button.titlebutton:hover,
-  popover.background .titlebar button.titlebutton:hover,
-  .titlebar popover.background button.titlebutton:hover {
-    text-shadow: none;
-    transition: none; }
   popover.background.touch-selection, popover.background.magnifier, .csd popover.background.touch-selection, .csd popover.background.magnifier {
     border: 1px solid rgba(255, 255, 255, 0.1); }
+  popover.background separator {
+    margin: 3px; }
   popover.background list separator {
     margin: 0px; }
 
diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css
index 55796bd0d2..64b4ba538a 100644
--- a/gtk/theme/Adwaita/gtk-contained.css
+++ b/gtk/theme/Adwaita/gtk-contained.css
@@ -1223,7 +1223,7 @@ modelbutton.flat,
   outline-offset: -2px; }
   modelbutton.flat:hover,
   .menuitem.button.flat:hover {
-    background-color: #d5d6d5; }
+    background-color: rgba(46, 52, 54, 0.05); }
   modelbutton.flat check:last-child,
   modelbutton.flat radio:last-child,
   .menuitem.button.flat check:last-child,
@@ -2250,19 +2250,10 @@ popover.background {
   popover.background > .location-bar {
     border-style: none;
     background-color: transparent; }
-  popover.background button.flat, popover.background button.sidebar-button, popover.background headerbar button.titlebutton, headerbar popover.background button.titlebutton,
-  popover.background .titlebar button.titlebutton,
-  .titlebar popover.background button.titlebutton,
-  popover.background button.flat:hover,
-  popover.background button.sidebar-button:hover,
-  popover.background headerbar button.titlebutton:hover,
-  headerbar popover.background button.titlebutton:hover,
-  popover.background .titlebar button.titlebutton:hover,
-  .titlebar popover.background button.titlebutton:hover {
-    text-shadow: none;
-    transition: none; }
   popover.background.touch-selection, popover.background.magnifier, .csd popover.background.touch-selection, .csd popover.background.magnifier {
     border: 1px solid rgba(255, 255, 255, 0.1); }
+  popover.background separator {
+    margin: 3px; }
   popover.background list separator {
     margin: 0px; }
 
-- 
2.30.2